From: Andrew Cooper Date: Fri, 5 May 2017 16:38:19 +0000 (+0100) Subject: x86/pv: Align %rsp before pushing the failsafe stack frame X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2159 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=cbcaccb5e991155a4ae85a032e990614c3dc6960;p=xen.git x86/pv: Align %rsp before pushing the failsafe stack frame Architecturally, all 64bit stacks are aligned on a 16 byte boundary before an exception frame is pushed. The failsafe frame should not special in this regard. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Release-acked-by: Julien Grall --- diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ef8c05a60b..13cdc504dd 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1743,9 +1743,8 @@ static void load_segments(struct vcpu *n) struct pv_vcpu *pv = &n->arch.pv_vcpu; struct cpu_user_regs *regs = guest_cpu_user_regs(); unsigned long *rsp = - (n->arch.flags & TF_kernel_mode) ? - (unsigned long *)regs->rsp : - (unsigned long *)pv->kernel_sp; + (unsigned long *)(((n->arch.flags & TF_kernel_mode) + ? regs->rsp : pv->kernel_sp) & ~0xf); unsigned long cs_and_mask, rflags; /* Fold upcall mask and architectural IOPL into RFLAGS.IF. */